From eac5ff467a15a8e0df5ae1d8340d9242dfeae4cb Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Wed, 27 Apr 2022 21:17:56 +0100 Subject: [PATCH] disable-java-in-odk-build-examples-on-zero-vm Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff --- config_host.mk.in | 1 + configure.ac | Bin 527536 -> 527845 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 8226e423069..330116d592f 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -331,6 +331,7 @@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVAIFLAGS_FOR_BUILD=@JAVAIFLAGS_FOR_BUILD@ export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@ export JAVAINTERPRETER=@JAVAINTERPRETER@ +export JAVA_HAS_ZERO_VM=@JAVA_HAS_ZERO_VM@ export JAVA_HOME=@JAVA_HOME@ export JAVA_HOME_FOR_BUILD=@JAVA_HOME_FOR_BUILD@ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@ diff --git a/configure.ac b/configure.ac index 98ecf3a968d499a8363b54cbf6220b0621a1c459..984ce9297e4946eb5b76c160ccd6df1d173956d1 100644 GIT binary patch delta 227 zcmdlmQ{m}sg@zW!7N!>FEi5Z)rhimt5t+VW5u31?mt&Ztr(cL`P(Y9?kW|PlRwymb z%u81&$w*a*N-fG)2=k5AHWP-V$(llvWZMy zV8p)tQVmNu<8+;PCQg2kv*JDACQW}R&lE7-fr*uMxFEi5Z)wjZixX=I$f%Y)5#dOe;pX E04R|Z`~Uy| diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 0d5fca58d2c..6bbe1e826e3 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -59,10 +59,14 @@ $(eval $(call gb_Module_add_check_targets,odk,\ ifneq ($(filter $(OS),LINUX MACOSX),) $(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ CustomTarget_build-examples \ +)) +ifneq ($(JAVA_HAS_ZERO_VM),y) +$(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ $(if $(ENABLE_JAVA),\ CustomTarget_build-examples_java \ ) \ )) endif +endif # vim: set noet sw=4 ts=4: -- 2.30.2